preparation for fixing issue #6