Fixed the broken logic from Schineder for abort statements