1) FIXED
2) FIXED
https://github.com/flower-platform/main/commit/55de117beee04052be649d104083abf13a870e94