Builder fix

Fix for the "first block" issue