#59 fixed features conflict