Better put_as_app fix