Fix for issues #212 and #213