Additional code to Fix #222