Fixing issues from previous removal