Fixed buggy state