Merge with dimichghs fix