Fix issue #5

It might fix...