v1.2 cleanup fix