FIXES TO v1.1