Added pwd/bin check