proper fix for the previous commit