fixing , ... ggrr..