Now works better on Debian