Fixes 1.1