Better workaround to issue #6
WIP