Strange behaviour fixed.
Preparing to merge into master