Really resolved #15