Bugfix ready to be pulled