yet another attempt to fix inter-activity issues