Fix for #313 issue