Fix the logic for internal .. commands