Fix issue #1 (following problem)