Parser: Fix #46 #48