fix the annoying - problem