This feels like it should be a separate bug