Adding workaround for X-Code 5.1