progressing
bugfix
will I finally be able to commit this??