Bug fixing

Signed-off-by: chmod <chmod@liss-e.gr>