Fix for Paul's concerns