Fix bug 271 and 273
Merge pull request #112 from Jero786/MYG000-271

Fix bug 271 and 273