even more advanced fixes