Fix for #373

This should fix #373.