Fixed activity creation