sorry for this quickhack, will maybe fix it someday