Fixed buggy behavior