Fix stages by AJ