Fixes Issue#2