Fixes about #13