fixed wap issues