Fixed broken functionality, fixes #6
Merge snippet