Fixed the problem described in e8a19e8