Fix issue similar to issue #11