added workaround for 4.8 analyzer issue