fix issue #30 and scientist tweak