Prepare for pull request

same bugs as before