Trying to fix building issue 2