Fixes #1000
rebased onto 53c552e20743915477259a71cc72c5d3822089a9
Pull-Request has been merged by ignatenkobrain
Fixes #1000