Fixed a nasty bug with the unlimited stuff