[PATCH] to fix ticket #349