Fixed top library computation for post* simulation flow

Please merge to 2015.1