Fixes issues with last commit