Rest bugfix