Fixed some effects wrong behaviors