Very ugly error fixed