Fixed a bug with cookies

Signed-off-by: John Snyder <juven14@gmail.com>
Merge remote-tracking branch 'origin/develop'