Fixed incorrect rect conversion
Fixed another incorrect rect conversion
Merge commit '546f029f8dd603e4ac3d742167206f52d424a8f3' into barz-master