Fix issue with system interupts