Fix as indicated by Dan Serban