Removed toString workarounds