Fixed #1 - fatal error on activation because the function name conflicts