Fix for build issue?