fixing issue #12
starting to look good...