Fixed Abort button
Support for 1.6 Fixed again