This fixes this issue #23