Fixing the bug in #1

I think the problem started in #1