Bug Fix - Black screen upon loading