Fixed mask issue