Fixed as per issue #7 reported by NeXxGeN