More fix for ISSUE #43 - geometry & other types as parameters