Fixed F17 compatibility issue by using manual system commands instead of macros