Now REALLY fixed the bug!