Bugfix for issue #63

Hi

I fixed the issue #63 and made a test that failed and passes now.