Maybe fix passive builder bug