fixing slash issue
reverting #503 on this branch