Release Build Fix