Issue #214 #1197