Fix bug 03-07