Preliminary fix for Bind empty path issue