a more proper fix