bugfix: dirty but works