small workaround for AM2 crash and reworked structure