Works now but is a dirty fix. See issue #8