Make sure we are using base name not full path