Forking Fix - v 1.0.2.1