Bugfix774

744 fixed
code review here:
http://mrccodereview.cloudapp.net/ui#review:id=1310