fix for ASP problems #178
merging master