Workaround for nullpointer bug in support lib, close #591