Fixed dependency on stdlib