Fixed de-coupling issue