Fixed YAB #2