ref#193 regretion fix
ref#193 codestyle fix