Can I fix this in a separate issue?