patched for 0.90