Fixed issue 30, thanks zoik/peteoc for finding it