I don't fully understand what the issue is you are attempting to fix with this commit. Could you explain the issues a little better?