Started implementation workaround for #13