Finally fixed libraries