Fix #195. Changed class types.