Bug Fix for Broken Build