thanks to @jonlives and @ickymettle fixing FC019 problems