Desktop version working fine