Fix compass working
Merge