Fixed issue with FP command creation.