fixed but there are new funny exceptions i got no idea where they're
from :-P