not sure if best practice, but fixed