One more fix for issue #55