small bugfix
Merge and bugfix.