sync up with 0.90.3