Fixed Issue #226?