Fixes #28

It fixes #28