Replaced original with version from FreeDDK and tested fine. One less to merge later....