Bug Fixes

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