fixed how the application will crash due to implmentations from last
commit