Fixes Ticket #1 . Also fixes BlockType crash.

Signed-off-by: William Lebel <lebelwilliam@gmail.com>