fix pull-request #6 troubles