(WIP) spec fix