Temporary workaround for #10