Fix bug; Refactor / to be explicit