Hopefully fixed weird link failure issue?