Fixed Nones by using replaceWith