Fix constructor to match core

Fixes #1577