BUGFIX: Same as last one, just incase there was some intended behaviour being changed arbitrarily.