Fix #12 - Alpha Build 6.3