#650

I re-created branch for issue 650, please, review it