No-way bug fixed