AP Bug Fixed