smoke works, fixes issues #28 and #30