Add Goal doesn't always work

https://twitter.com/AnasNTy/status/1347540633544773632

Thanks @anastely for reporting.

https://user-images.githubusercontent.com/157534/104028413-fcb59600-51c8-11eb-8ad1-f3737d605a86.mp4