Fixed edit mask issue