slightly simpler fix