Fix/1362 better grunt

Fix for #1362 
- [ ] Ready to be merged