Try to address #612