Merge fix to abc71c9b543543edc3c3bf25d90fc14a07522fc0