[BugFix] #861

More info here: #861.