fixed issue from last commit