Fixed constructors, thx Reto