For #272. Closes #273