Fix for last commit (still not working)