Fixing last commit to actually work