Simplify compass and fix for 1.5