Fixed bugs with missing ...