Fix for superfluous zero-padding