Fixed last commit to work properly