Potential bug fix for issue #1