Bugs fixed: 732,735,736