workaround to initialization issues, remove when resolved