Removed some magic.