Not sure how this was working before