1.24-25 bugfix commit