[ADDED]: added stupid solution for issue #6.