Updated patch to work whether user is in bin directory or not