This enhancement is caused by #81
This enhancement is caused by #81