Fixed constructor (merged old and new) #277
Little bugfix