Fixing #48