Fixed for issue #6