a simple solution to resolve #13