Merge with bugfix