Final solution (damn bugs)