Merge of an old stashed bugfix