Fixed @Eximius88's issue #26