export tested and fixed