Partial support for new 1.2.3 update.