Merge of fix