Whoah. This is quite an ugly hack. Do you have any suggestions on how to improve this?