Fix for latest snapshot ``changes''