Fixes Issue#48