Also add rightclick check here