Fixes issue 19? https://github.com/kbparagua/paloma/issues/19