another quick fix - 2