added workaround for #19