fixing to static allocation (in progress)