Fixed bugs

Signed-off-by: sareth <sareth@sareth-Lenovo-V570c>