Bug fix #55

Wow, I found a solution!