it's not buggy anymore :D