bug fixed, olaf saved
merged