Fixing girdly problem