Fixed Issue #68, #69.