flax

8b2e56e9 - Merge pull request #1458 from slowy07:minor-fixing