Fix for 1.0-ALPHA