Fixes #7

#7 fixed