fixing move to 18f