fixes from leroux