ugly hack in to fix customer initialization