Fixes Issue 94.