Fixed issue #63, code was written to support this anyway