Weird fix for a weird bug