Bugfix 2 for __future__ issue