Trond's prefix fix