Updated fix for 12Bug