Fixed common js compatibility