Fixed bugs in props handling