Fix for PBS