patched almond for now..