Adding fix functionality for invalid ways