Adding work-around for issue #6