fixed some basic miss match