Fixed TWEET-29 & TWEET-30

Signed-off-by: Marcin Wiatr <mail.wichura@gmail.com>