Listing abort fix
to be tested