Fixed #294 by reverting 8eda48129a (restored #259) relating to metrowindow