Master branch initial fix