BUG:  Restoring functionality after mask enhancements.