Fix for BETA 2.

Not compatible with BETA 1 anymore.