Core/Scripts: Fix for issue #882

#882