Fix issue 21

@sirhcwolf Can you verify that this fixes the issue you saw?