Fixing for Beta 6, but occuring link error! :-(