issues #DIY-95 and #DIY-96