Mircea: Solve the small annoying bug