Fixed Issue #1224

#1224