fixing merge from T.Mrugalski's branch (Reconfigure vector failed)