Hr 216 fixed

Please don't merge this request, this request is just for review.