seem to fix all bugs...