Fixed a major api brake by @petterroea, shame!