Fix overengineering