Mini-Geek fix issue 17