Fix stop method and features problem