Added requested fix