Addressed issue raised by @mrclay