I've removed that ugly exception :/