Simplifying code for #187