Added quick patch for positioning issue