Fix for #2151 #141

Closed
wants to merge 2 commits into
from