Try to improve padding