fi
15 september fixes