Fixing types

addresses #1063