Should have been part of previous commit