Add implicit mask to fix #11