Additional utility functions
Fix #836