bug fixes for last addon update