Offset fix for .__fake__
Merge branch 'coffee' into develop