Workaround for strange circular depencies