Fix for where command