fixed one small problem with last merge fix