type + velocity fix