Fixes APC bug