Fixed #1 - hotpatch will need to be streamlined in next refactor