Bug fix #63

This fix is not very nice, but it works