Fix/builder from input

Fixes bug #1355.