Fixed our buggy design