Fixed some magic