Improve #php stability