hack fix with returning static struct, need to fix that next checkin