Forking Fix - v1.0.2.1