Fixed as per issue #4 reported by NeXxGeN