Fix for Rubisk's fix