Fix for #224.

This is quick fix for #224. (and maybe #94.)