Fix/1362 better grunt

Fix for #1362 
- [x] Ready to be merged