Bugfix 97 first in