#45 issue functionality fixed