required fixes