Mareike's bug removed