Fix for issue reported by Valan.