Fixes bug #57