There was a bit of an oddity with this, it is implemented in a way that should not be an issue for other systems. Reviewed at: #31