Improved likeness to VLC behaviour