[FIX] Fix PR #490

See last comments on PR #490