Changes for #249