Fixed apos bugs