fixing #16 (more)

Hi, your last fix was not enough. With this it works for me now.