issues#81

to @pytkin from @supercaracal