fixes for everybody!