Fixed for issue #4