Fixed, incorrect merge has modified code had been moved to new location