Ionut fix for special handling case