Fixed #79
Revert workaround for #45