Fix for workaround in code sample