bugfix for jack's side