Trying to fix building issue