Fixed issue from previous commit