reverted unnecessary changes - compiles fines without them (issue #7)