Fixed somewhat