DAR-570 | Fix WAMPage