Will be addressed by #59