added workaround for #3