Final fix for previous commit