Addressed in later commit