Fixed arch related bug