Bugfix + ready for merge