fixed speed issues