@amrali's fixes