Bug Fixing

https://bugtracker.noterik.com/view.php?id=2772 &
https://bugtracker.noterik.com/view.php?id=2774