Fixed linrary creation