Fixed 24/25 bug