Fixes bug with last commit