Revert "Buffer over flow"

This reverts commit af523b0362e031c756a69f6b1262379c337217b4.