#44: tiny changes