Add some extra space buffer