Fix bug with unsupported case