fixed #148
fixed #148. all samples working properly now.