Fix for BUILDARGS issue