Try to fix props