Fixed Issue #222 again