Code

Removed temporary workaround -- it seems it was a bug in the