Jan Jeppesen bug fix