Yet another quick fix #2