Fixes issues with previous commit