fixing #28