bug fixes from fr