Bugfix for remember handler