bug fixing, and uniterruptibleMask instead of mask