Fix primitive init handling #56