Closes https://github.com/minimitch0199/Maps/issues/19