Issues fixed

*apc-37
*apc-25