fixed #58 (warning: it is ugly)