bugg-fix, working properly now.