Hopefully fixed build issue