Strange code mixture fix