start fixing issue #17