Fixed problem with primitive types