To be addressed by #426