Updated to reflect #252