fixed wierdness