Better workaround for the STPL interrupt bug