Fixed: commitcomment-4639131, #commitcomment-4639128