Fix padding problem - from Michael