need to fix this as well to avoid reflection errors