fixbag #1. Now it works.