no-pad critical bugfix