Base64 fix

Based on stef comments. #93