Fine tuning for #106