Fixed wall bug and compatiblility with mobile phones