Workaround to link problem