Fix for terminal scheme