fixing Steffen's bugs