Trying to fix Christian's bug